Removed triple click check
Added ID to assignment