wip: some modifications