Removed some dependencies and switched from lfr->ray