TW-13: Fixes functions order