Implemented tp and added warps