Merging back changes from laptop.
cleaning up