merge with penelope.trac