Tweaked to AOP two methods rather than one