Updates by swjal