Working version

Working version in production environment.