now with return working, but lots of noise