made slightly more ff friendly.