Slight change to constructor