Synched with updates made to PortasTroiae