Completed extension #2