make these consts and not defines