Improved McdEntry loading giving way to editing