Comleted recalculating height feature #1