- updated the comment
- removed the hacky things
- changed to support customized flexHome