Final tweaks done, now is ready to merge