adding back historyactivity with some changes