updated for team paged, pull from production