Final commit 12.11.14