Add r & b only functions
More debug messages