Removed second database call and replaced it with operations on the
local object