Transferred constants into proper ... constants