Some changes in pj.cs