new version
new version, and removed buggy version