removed the rest of the !empty if statements