done before annoying changes