Rick's changes