#13 Modified code to allow basic decorating