tested some, should work now