Fixed decorator code (still learning)