FIXED: TYPE and missing phpdocs