Made everything 1.7 compatible!