added bike fix
refactored