update cleaned version to avoid bugs