Added PIE and TODO