Added punctuation and readded management