No need for a second conditional check here now?