Added most recent changes