merged from the team at 8pm