moving wp too early?
re-add curves