Was hasty in the fix, much smaller now