removed some buggy input code