updating with Raju and Sandra private versions
merge orca files
merge orca changes