New parameters + better comments