still trying to fix things