updated with rick changes