constructor changes etc
constuctor changes etc