Some changes from zamok