still trying to fix 2