Rick suggestions addressed