Changed arrangement of input functions