give it another try now, made some changes.