Better input state handling

Now handles active once state correctly