new fix
basic clean up