Changed Stage class slightly