moved everything, but it works (and is slim)