Added to changelog
Added if statements and else if