Improved after comments from Rick