edited from tutorial3 again