merged agnoster changes