finish changes
finished workaround