Merging witth Carlos's lsat commits