Updating to closer reflect the desired app functionality