Reworked the decorate call stuff