modified for oescc