Adding final touches