Fix and new Feature 1