Updates to logic