commit 4b - adding first if