changed everything and made it work