Added comments, going to sumbit to Sakai