refactoring
version 0.2
forgot to remove the flag check, that was meant for the rename feature