Modified the .init...for real this time