Updated to tutorial #24