Add explainatory comment, fiddle with map