Updated for new design version