Started limiting choices to only valid actions