more changes made to the strategy class and stage class