Updated with clipboard tweak