Check logic WIP