Completed extension #3