some modifications for tutorial..