Added decorator...

Needs more testing