optimizing initialization and when to include source info
0.1.6 optimizes initialization and memory usage