Alterations after review with Mihai