updated for sf 2.3