Added some things that Paloma wanted