Reworked CTOR
commit problems