finishing for now to do some changes on NG