Utils added and error checking