some changes with Jay