updates

Change-Id: I2f6f50364ab4d7565bd254554cff8f83555a06b1
Working on minfree

Change-Id: Icdff46f97b359849c634528153a7a03b56f6ff03