Code Refactor. Add speed for tank