updating based on Thurs. and Fri. changes