commenting out problems - will fix