add better titles and swap usage