Modified to remove unnecessary database call