Adding Tomer's Part