[WIP] Additional checking