adjusted to changes on segine