updated according to advises of yumendy