added candi's changes