Update upon Ivan's suggestion