P05 / P06 - Moved functions to main object