Edited if/else to test animation