Originally cloned from Metis, added my stuff