Added history following TJ pattern