Modified the thing a bit