updated, now with functionality