Added sources and much more