ocs and settings are on core? please add comment - otherwise it will be confusing - thx