got rid of if/else - LG