merged with 1.1