Final commit 19-9-14