commenting out stuff not necessary yet