Extra fixes -> Some one edit PGMS.java to suit this