Merging lithium's changes