Updating to include alerts functionality