added Charlie's suggestions