Improvements to the EPG thanks Finbarr