added some stuff, it's dreadful though