adding stuff from my other setup