updated updated functionality