added more horrific code