majorfeature change started
by devtwo on majorfeature branch