Update: fancied up check ()