RM : Changes for reporting + version clean up