Version 2.2, speed improvments