Updated with checks