#utility improvements

1 story