Made various changes.
Latest changes