merged
factory ver2