fixed over write issues