fixed initialization
merge done