built and tested corey's changes