Removing more duplicate code ... need to be more careful.