new version with working deployment