Final version for client delivery