working on soi transitions
z issues fixing