Fixed if/esle, added feature to override props object