Pushed too early, removed wrong return value stuff.