getting it ready for community edition