Initial STP commit
Updated STP