heavy WIP: kernel improvement