added loading state and linked neighbors