Updated to use handle_lower