got rid of the stupid package distinction