even cleaner.... and with c files for extensions