updated with new design