Parially incompatible with rwd

Removed untill fully compatible