Removed useless1, modified p1