Also, I would put this code before the add block principally