Elinw postinstall

This includes an update + rebase