Added first stab at optimizing how