refactored to remove @p1 and @p2 bc its unnecessary