Simplify, improve and understand better starting now.