Optimizing source for easier developing #1.2