Added full commenting