First try to introduce comments... Manifest is disabled for now