Added some more measures;