Change felix2 structure and functions