#2 several methods added