Major updates to Diane