my new changes as of 21st Nov...