Updated cleaner