Adding some finishing touches