Basic improvements 2 projject