Changing 'elif' for 'if' (test must always be done)