Updated to Docker & fig