Added some filling logic