Added second condtional statement, final commit of v1.0