updated version to include the recent additions by wbajzek