came back to the problem and made some changes...