Updated with the latest changes from designer