implement feedback
fin
fin for real
merge some change on master