tweaked to work