Added redundant Code for Speed Calculation - needs an overlook for unesseccary functions