Code update

Updated code to make it extremely important the user reads every window
carefully.