updated finally Dec 2