Added check about being patient