Updates to app logic