updated setup and manifest