some changes
reds #48 done