Enhanced Assemble Action + Small Bug Fix