changed stuff so packaging will work