Add snap back in, clean up attribute setting.