Added all the finishing touches