simplified code by commenting out stuff