Added extra bumper functionality + spinner switches