Better finish + package magic