0.4 Function update

See changelog