Input dispatcher remake #2