Comments/credit added and renamed