integrating Nick's changes w/r to assets directory