Massive changes in all files!!!!
by RA & MK