1) todo added
2) fixed