still trying to fix issues