Added more screenplay logic