Addressed latest comments