A few more changes for final project