Finally seems to work for 2