More of pcercuei's changes