conditionals fixed