re-fix init and code