Rick's suggestions added