This bit doesn't seem like an improvement :)