FUL-48 - Commented + final version