fixed wheel positioning
merging