This should fix most control issues and embed