fixed
comments + change of structure