Working version before cleaning.