a lot of changes for final presentation