Improved overall framework