Edited to new motor configuration