conditionals fixed for win