reworking

contact: joshua at treudler dot net