More functionality, cleaner code,