Combined and some tweaks