lastest changes
forgot manifest
merge