small changes, everything should be ready