Last reference updates

Resolves #5