Added constructor code again