More modifications .....much to finish