added some to whether/if section