final changes before moving it to real