core infrastracture fixed