Completely reworked

Signed-off-by: Bite Ye <biteye@mpi-sws.org>