Added isSource parameter and formatted again