x - various changes