Thanks OlegKoval

# Thanks to OlegKoval
# my updates - suggestions