first pass at editing new functions