redone to hopefully take care of all the derps