batch & single works, structure cleaned