Final Modification for aesthetic reasons