Final project stuff modified