0.1.7 subjects revamp