source lab adapted to new architecture