now working perfectly

ready to merge