dev snapshot: OF fit fully working