Added a boolean conditional.
Finished with editing.