updated logic, added lizard/spock extras