some modifications, resolve/reduce wip