Patch 1

Some improvements )))