Got rid of empty checks