got rid of eager fetching
working