added extra funcionality- COMMENTED