add h and s to ll and remove unused stuff