The header changes are still not effective but I shall add them and commit again soon. :)