merge, todo: smoothen and expand