More work on the new features