Changes to work with new design