fixed id versus class, edit 2, mac sync 9/28/2014 3