moving some things around
nil check errors