God class update