little cleanup, added TEMP abstract