some changes to callbacks
updated history