Changing to use prototype