Adjusted for new contructor paramaters.