Infrastructure some minor changes have been made