Add Gioriogs modifications