Faster and better. Can't find the crash. :(