improved functionality
minor