Fixed Extensions and Added New Code