Remove if statement
Fixed heading part2