Added final features. Ready to test