Update mech

Parsing update + recalculation implemented