commit 6b - adding else if