Fixing up project