update to work with SF 2.3