Modify assert code completely again