Reformulated some things