changed state matching
added masses
added masses
removed unused files