still trying to fix charts