revised and enhanced edition