merging from ashansa