Changed things to fit the pl