Modified to allow for easy analytics