Changes for final part of project