refs [SM-#2] and stuff