moved to objects almost everywhere, added energy saving features