Initial measure handling, contains bugs