cleaning & adding lib support v4