merge with rb-helper