some more changes. please confirm!