A slight modification
A few new feature requests