merged from allen