roughly working changes