Added more blocks; replaced \t with spaces