Major changes applied