almost done w Aop plugin ...