made a change
add changes by master
fix problems in hotfix
finished modifying testing
merge all