Removed the "not yet" message and added comments