reverted to 1.7, including functions