added some stuff that was not committed from my laptop.