added a temp check (still sth is wrong!)