FIX: Added Checks // video