updated to make shit work with latest eloquent version