redesigned with proper contracts

Signed-off-by: Jan Dvořák <mordae@anilinux.org>