Revert "Revert "Original code validated by Udacity""

This reverts commit 1b5504dda88ce487aaeeb70a89f1dcf9812b9664.