FINAL CODE COMMIT