ok its done all in one

fixed it all