reworked baryon.cc