Change it to decorator