I made some changes in the OP again.