Commit 3 week 12 Leon