Finalized TS-002
Added TS-003