Revamp with My GE stuffs