add more self checks + reply to comment