removed more error checking