Two extras are now passed in to the intent to Alert, along with various
changes