Switched to use new initializer