Added the modifications specified by extrafu