some changes, todo added