Changes made for use with Assemble.