Feature/if then else block