Changed all epilogue and prologue methods