still trying to fix stuff