some improvement regarding last commit