Lots of changes done to get it to work!! Can't list all