Fixed and works

sorta