modified to charmaine