updated for proper packaging