updated for SOFA board's requests