fix and enhance