try to speed up things a little