MASSIVE upgrade