Changed parameters for constructor