some small changes, just like last two commits