made changes to construct