Made input system-independant too