Finished merge with lt code