final adjustment to changes by gdbgauda, thanks man ;)