Updated eventmachine