Updated from Johan and Qi