Last changes for working bot