changed design and added some fix
New project