action Basti's review comments