Update for future

Changes that I will keep writing on top of.