+ Merged develop and solved merge conflicts + Added missing weight after update + Cleaned up not neaded parseFloat