Amazon has added new education-focused features to the Kindle FreeTime options on Kindle Fire devices, which allow parents to make sure kids have met all their education goals before the tablet can be used for games or cartoons. The update, announced on Monday, also allows parents to manage the amount of time their kids spent using the device by setting time limits according to whether it’s a weekday or a weekend. Amazon said a bedtime cut-off can also be set in this way. In addition, the company said it is adding “thousands of educational books, apps, games, and videos” to the Kindle FreeTime Unlimited subscription service, which costs from $2.99 per month. The updated version of Kindle FreeTime with these new features is set to roll out “in the coming weeks”, Amazon said.