added some changes from todo list, labeled Lourdes