added final init changes