moved code around, but most importantly, we fixed the watches