Major Changes Made