patch 002 and 003 combined