Made the changes Kevin wanted