- removed false comment
- implemented comments