Added David's modifications to the Character class