More of Rick's changes