My changes. will merge now.
Merged together everything.