got rid of conditionals until they work