New features

2 small features