Completes enhancement #52.