Some changes. work in pwogwsss