FInal commit 3