7.30 update, almost submittable