Rafi's edit to fix issues