Wercker improvements