updates based on discussion on gitlab