Switched to original eloquent code