Modified to pull in more