Needs fixes

needs fixes