merged two wip versions