retooled some things