added format stuff