Speed improvements #5 #6