Manual merge of the Michael's version, still to check for some name consistency
Package DC corrected
Package AC corrected
Other minor errors corrected