Changes to adapt to Marios new structure