Fixed new init function