Trying a different approach to speed things more