Required changes after testing from scratch.