tweaked further