added more feature options