got rid of empty check