Proper checks now