added parameter keep_organized