fixed epr review comments