task #35 and task #1003
fix task #29.1 add task #35 & #1003