cleaned up willpack for 1.4