Working version with locale and static checked in