Final Changes to constructor with Tyson's changes