improvements after Norberto review