Dropping phantom definition.
Comment reordering.
Additional tasks added.