Recalculation Added to Draw

Cleaner code