first set of changes according to oscar's review