Levelup/supportive

Supportive further refactored
Explicit return? C'mon man...