Minor changes for final project