Uncommented some features. Evetything builds with success