Took out testing boolean