phew! new changes