loredana branch: 4 commit