Comitted some coding as told by website