Merge code from popomore