Improved the fixed container