Methods order rearranged again, before was better