@Hawk's changes