clean up michels new funnctions....