changed list init
merge fix