improve 001 and 003