diff --git a/lib/provider/kleinanzeigen.js b/lib/provider/kleinanzeigen.js
index b2429df..38cb8c5 100755
--- a/lib/provider/kleinanzeigen.js
+++ b/lib/provider/kleinanzeigen.js
@@ -3,37 +3,37 @@ const config = require('../../conf/config.json');
 const utils = require('../utils');
 
 function normalize(o) {
-  const address = o.address.split('\n')[4].trim();
+    const size = o.size || '--- m²';
 
-  return Object.assign(o, { address });
+    return Object.assign(o, {size});
 }
 
 function applyBlacklist(o) {
-  const titleNotBlacklisted = !utils.isOneOf(o.title, config.blacklist);
-  const descNotBlacklisted = !utils.isOneOf(o.description, config.blacklist);
-  const isBlacklistedDistrict =
-    config.blacklistedDistrics.length === 0 ? false : utils.isOneOf(o.description, config.blacklistedDistrics);
+    const titleNotBlacklisted = !utils.isOneOf(o.title, config.blacklist);
+    const descNotBlacklisted = !utils.isOneOf(o.description, config.blacklist);
+    const isBlacklistedDistrict =
+        config.blacklistedDistrics.length === 0 ? false : utils.isOneOf(o.description, config.blacklistedDistrics);
 
-  return !isBlacklistedDistrict && titleNotBlacklisted && descNotBlacklisted;
+    return !isBlacklistedDistrict && titleNotBlacklisted && descNotBlacklisted;
 }
 
 const kleinanzeigen = {
-  name: 'kleinanzeigen',
-  enabled: config.sources.kleinanzeigen.enabled,
-  url: config.sources.kleinanzeigen.url,
-  crawlContainer: '#srchrslt-adtable .ad-listitem',
-  crawlFields: {
-    id: '.aditem@data-adid | int',
-    price: '.aditem-details strong | removeNewline | trim',
-    size: '.aditem-main .text-module-end span:nth-child(2) | removeNewline | trim',
-    title: '.aditem-main .text-module-begin a | removeNewline | trim',
-    link: '.aditem-main .text-module-begin a@href | removeNewline | trim',
-    description: '.aditem-main p:not(.text-module-end) | removeNewline | trim',
-    address: '.aditem-details'
-  },
-  paginate: '#srchrslt-pagination .pagination-next@href',
-  normalize: normalize,
-  filter: applyBlacklist
+    name: 'kleinanzeigen',
+    enabled: config.sources.kleinanzeigen.enabled,
+    url: config.sources.kleinanzeigen.url,
+    crawlContainer: '#srchrslt-adtable .ad-listitem',
+    crawlFields: {
+        id: '.aditem@data-adid | int',
+        price: '.aditem-details strong | removeNewline | trim',
+        size: '.aditem-main .text-module-end span:nth-child(2) | removeNewline | trim',
+        title: '.aditem-main .text-module-begin a | removeNewline | trim',
+        link: '.aditem-main .text-module-begin a@href | removeNewline | trim',
+        description: '.aditem-main p:not(.text-module-end) | removeNewline | trim',
+        address: '.aditem-details | trim | removeNewline'
+    },
+    paginate: '#srchrslt-pagination .pagination-next@href',
+    normalize: normalize,
+    filter: applyBlacklist
 };
 
 module.exports = new Fredy(kleinanzeigen);
diff --git a/lib/provider/neubauKompass.js b/lib/provider/neubauKompass.js
index cf4b7ec..f7aa5bd 100755
--- a/lib/provider/neubauKompass.js
+++ b/lib/provider/neubauKompass.js
@@ -4,9 +4,7 @@ const utils = require('../utils');
 
 function normalize(o) {
     const title = o.title + '| '+o.subTitle;
-    //this is a bit nasty, but we do not have a size, therefor take the availability and set it as size to not modify notifications any furter
-    const size = o.available;
-    return Object.assign(o, { title, size });
+    return Object.assign(o, { title });
 }
 
 function applyBlacklist(o) {
@@ -17,15 +15,13 @@ const neubauKompass = {
     name: 'neubauKompass',
     enabled: config.sources.neubauKompass.enabled,
     url: config.sources.neubauKompass.url,
-    crawlContainer: '.md__property-list .post-list__item',
+    crawlContainer: '.row article',
     crawlFields: {
         id: '@id',
-        price: '.entry__main .entry__data li:nth-child(1) span:nth-child(2) | removeNewline | trim',
-        available: '.entry__main .entry__data li:nth-child(3) span:nth-child(2) | removeNewline | trim',
-        title: '.entry__main .entry__title | removeNewline | trim',
-        link: '.entry__main .entry__title a@href',
-        subTitle: '.entry__main .entry__subtitle | removeNewline | trim',
-        address: '.entry__main .entry__info | removeNewline | trim'
+        title: 'a@title | removeNewline | trim',
+        link: 'a@href',
+        subTitle: '.p-3 .mb-2 | removeNewline | trim',
+        address: 'div.p-3 > p:nth-child(3) | removeNewline | trim'
     },
     paginate: '.numbered-pager__bottom .numbered-pager--info li:nth-child(2) a@href',
     normalize: normalize,
diff --git a/test/kleinanzeigen.test.js b/test/kleinanzeigen.test.js
index 53bd7b2..51d996d 100644
--- a/test/kleinanzeigen.test.js
+++ b/test/kleinanzeigen.test.js
@@ -40,7 +40,6 @@ describe('#kleinanzeigen testsuite()', () => {
                     expect(notify.id).to.equal(
                         kleinanzeigenDbContent.kleinanzeigen[idx]
                     );
-                    expect(notify.price).that.does.include('€');
                     expect(notify.size).that.does.include('m²');
                     expect(notify.title).to.be.not.empty;
                     expect(notify.link).that.does.include('https://www.ebay-kleinanzeigen.de');
diff --git a/test/neubauKompass.test.js b/test/neubauKompass.test.js
index dd27c86..6882804 100644
--- a/test/neubauKompass.test.js
+++ b/test/neubauKompass.test.js
@@ -29,16 +29,12 @@ describe('#neubauKompass testsuite()', () => {
 
                 /** check the actual structure **/
                 expect(notify.id).to.be.a('string');
-                expect(notify.price).to.be.a('string');
-                expect(notify.size).to.be.a('string');
                 expect(notify.title).to.be.a('string');
                 expect(notify.link).to.be.a('string');
                 expect(notify.address).to.be.a('string');
 
                 /** check the values if possible **/
                 expect(notify.id).to.equal(neubauKompassDbContent.neubauKompass[idx]);
-                expect(notify.price).to.be.not.empty;
-                expect(notify.size).to.be.not.empty;
                 expect(notify.title).to.be.not.empty;
                 expect(notify.link).that.does.include('https://www.neubaukompass.de');
                 expect(notify.address).to.be.not.empty;