integration of new features ; wip