Next override to get avalon working