Yes, I will improve it by linking them properly.