Slight modification of constructor