fix 10: change method flow
fix 10
fix 13: check spelling