Added minutia, hope it works