Adapted for 1.7