latest changes with art fixes, and implementation