stil trying to fix