better stage management