funcking smLL FIXES