Changed from email + timing optimizations