Simplified features, updated functions