update based on jimb's review