Edited SMOF version