[@GrafRoy Zeppeli] make these changes and I'll accept it right now, post it in the bin with changes.