squash - more cipher work
Some changes