hassan's changes