Important changes made.

Very very important.