Adding repeat and removing tcomment for commentary (for now)