Fix #8 #2 ~ Insight