Removed question marks, added more parameters
Added parameter descriptions