Nice improvement :)