made some constructor changes