Full tilt functionality, code tidied