Make compatible with 1.7.2 in addition to keeping fuctionality for 1.7.10