Redesigned whole project