WIP: overall improvement