Corrected code and comments
to accomodate for 29.2