updated to new design framework