added better locking to the feed server