09.12.13 less stupid source structure