Add some new features to this app