Made changes sugessted by GJ