tweak some code and add data