Got rid of empty function