somewhat of a revision