changed to decorator way of doing things