pat 1014-1017 refact