Re-adding comment
Fixing defines variables