Add options: update and port. More readable code too