Added psycowithespn changes