fixed name, added constants