* Intrim changes