added working version from local