New feature, small fix