conditionals implemented, update structure revised