More advancements on #97