Cleaned up fill