added suggestions from pancake