A few more features converted to new design