changes to constructor.