change initialization back to the new way