added Dan's bit