first shot at optimizing - maybe enough...