optional parameters instead of wrapper functions
experimental commit using patchmode

Signed-off-by: Leo Bärring <leo.barring@gmail.com>