added more feature code