stuff should work better now