Changes almost ready