Added Given and Prompts; Changed Logic