Small loading state improvement