latest changes for simon