these two are getting completely redone