edit master_141214