Adding finishing touches