Undocumented
Added some parameter handling