Modified to base 4.7 and updated teaching