cleaned up code and added support for pac2