Updated with Lomov and Straumit