changing to bill today
complete merge