work in progress with less issues