Updated to new prompt system