Modified prompts and finished implementation