new freatures for issue #6