added more tweeks