details on demand added - last merge didn't go so well so recommitting