JustinCappos Suggestions from Ximin Luo. I need to polish