refactored examples to adhere to new concept