Should work, small changes