Working on interface, fixed if loop on main file