triying to fix all this s..