Chris & PJ code added