Updated prompt and added functions