tutorial cleaned up