Updated to latest input lib