Updated for strategy method and added names to each bucket.