A couple more tweeks