Learning & Improving my version