updated based on Margies list