SF-24 improvements