Modded my 42036 further, quite happy with it now : lego