Changed few things and updated.