Modified the feature a little bit