got rid of the elsif