ok think it wokrs now
removed all couts I think
done