Move new()
Fixup Meter
Fixup according to latest changes