ECM now calls delegate methods, removed extra stuff