final changes for init