Changes to get it running