Updated Undecorator