restructured a bit to welcome a new client