added suggestions from Frank