sources improvements