changed packery #6 #21, works much better now