Added pre and post signals