new parameters, finished documentation