adding in changes from first day of apathon