merged offline version